Merge from trunk.

diff --cc src/ChangeLog
index 40ac63840c998bba0ea5a708ce0357c949e888ef,d9c24099f416bf347156c1b3f7a68ebaaa4e2aa4..93d28e231a3eb1242f2b924329d9aa63928fe27a
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,14 -1,12 +1,23 @@@
 +2011-05-31  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Use 'inline', not 'INLINE'.
 +      <http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00914.html>
 +      * alloc.c, fontset.c (INLINE): Remove.
 +      * alloc.c, bidi.c, charset.c, coding.c, dispnew.c, fns.c, image.c:
 +      * intervals.c, keyboard.c, process.c, syntax.c, textprop.c, w32term.c:
 +      * xdisp.c, xfaces.c, xterm.c: Replace all uses of INLINE with inline.
 +      * gmalloc.c (register_heapinfo): Use inline unconditionally.
 +      * lisp.h (LISP_MAKE_RVALUE): Use inline, not __inline__.
 +
+ 2011-05-31  Dan Nicolaescu  <dann@ics.uci.edu>
+ 
+       Make it possible to run ./temacs.
+ 
+       * callproc.c (set_initial_environment): Remove CANNOT_DUMP code,
+       syms_of_callproc does the same thing.  Remove test for
+       "initialized", do it in the caller.
+       * emacs.c (main): Avoid calling set_initial_environment when dumping.
+ 
  2011-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * minibuf.c (Finternal_complete_buffer): Return `category' metadata.